home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
Software Vault: The Gold Collection
/
Software Vault - The Gold Collection (American Databankers) (1993).ISO
/
cdr10
/
diff101.zip
/
DIFF.DOC
< prev
next >
Wrap
Text File
|
1993-06-01
|
18KB
|
632 lines
DIFF
_________________________________________________________________
File Difference Utility
U S E R S G U I D E
Version 1.01
┌────────┐
C.SITTE SOFTWARETECHNIK │c.sitte │
Postfach 42 │software│
A-5025 Salzburg/Austria │technik │
└────────┘
EDITION
May 1993
Copyright 1993 by C.Sitte Softwaretechnik
All rights reserved
NOTICE
This documentation is based on the software revision V1.01 of May
1993. The information in this document is subject to change
without notice. C.Sitte Softwaretechnik assumes no responsibility
for any errors that may appear in supplied materials or programs.
SHAREWARE INFORMATION
DIFF is distributed under the shareware marketing concept. This
means that you can try the program for a limited amount of time
to see if it meets your needs. After the trial period, you are
required to register and pay the registration fee or stop using
it.
Shareware is a distribution method, NOT a type of software. The
primary difference between shareware and retail software is that
with shareware you know if it fits your needs BEFORE you pay for
it.
The shareware system and the continued availability of quality
shareware products depend on your willingness to register and pay
for the shareware you use. It's the registration fees you pay
which allow us to support and continue to develop our products.
Please show your support for shareware by registering those
programs you actually use and by passing them on to others.
LICENSE
Non-registered users are granted a limited license to try DIFF
for a period of four weeks. After the trial period you are
required to register and to pay the registration fee or stop
using it. The four week evaluation period is a legal requirement
based on the license agreement, NOT a time bomb inserted in the
program! DIFF will not stop working or cause any damage to itself
or your system at the end of the four week period.
T A B L E O F C O N T E N T S
---------------------------------
1. INTRODUCTION . . . . . . . . . . . . . . . . . . . . . 1
1.1 PACKING LIST . . . . . . . . . . . . . . . . . . . . 1
1.2 DISTRIBUTION . . . . . . . . . . . . . . . . . . . . 1
2. USAGE. . . . . . . . . . . . . . . . . . . . . . . . . 2
2.1 ARGUMENTS. . . . . . . . . . . . . . . . . . . . . . 2
2.2 COMPARISON OPTIONS . . . . . . . . . . . . . . . . . 2
2.2.1 CASE INSENSITIVE COMPARE (/c). . . . . . . . . . . 2
2.2.2 IGNORE TRAILING BLANKS (/b). . . . . . . . . . . . 3
2.2.3 EXPAND TABS BEFORE COMPARING (/x). . . . . . . . . 3
2.2.4 IGNORE SPACES AND TABS (/s). . . . . . . . . . . . 3
2.2.5 TAB SIZE (/t##). . . . . . . . . . . . . . . . . . 3
2.2.6 DISPLAY WHOLE FILE (/a). . . . . . . . . . . . . . 3
2.2.7 OUTPUT WIDTH (/w##). . . . . . . . . . . . . . . . 3
2.3 DIFFERENCE DISPLAY . . . . . . . . . . . . . . . . . 3
2.3.1 Example. . . . . . . . . . . . . . . . . . . . . . 4
2.3.2 Redirection. . . . . . . . . . . . . . . . . . . . 4
3. WARRANTY . . . . . . . . . . . . . . . . . . . . . . . 5
4. ASP OMBUDSMAN STATEMENT. . . . . . . . . . . . . . . . 5
5. ORDER INFORMATION. . . . . . . . . . . . . . . . . . . 6
6. To help you - help us! . . . . . . . . . . . . . . . . 7
DIFF - File Difference Utility V1.01
1. INTRODUCTION
DIFF is a DOS application wich displays two text files side by
side. Common and different sections are clearly marked with
separator lines.
DIFF is especially useful for programmers who wants to see the
differences between two versions of a source text file. Tab size
and comparison options are configurable.
1.1 PACKING LIST
Shareware copies of DIFF may be "packaged" in a variety of ways
depending on who distributed them. Regardless of packaging, the
following files should be included:
DIFF .EXE DOS File Difference Utility
DIFF .DOC Documentation
ORDER .FRM Order Form
DESCRIBE.DOC Product Description & Author Info
VENDOR .DOC Vendor/Distributor Information
FILE_ID .DIZ Program Description for BBS's
!!READ .!ME General Info and Last Minute Information
1.2 DISTRIBUTION
You are encouraged to freely copy and distribute DIFF provided
that (see VENDOR.DOC for more information):
1. No fee beyond normal media, duplication, and shipping costs
may be charged.
2. It must be copied in unaltered form complete with this license
and copyright information.
3. It is advertised as "shareware" and not as "free" or
"public domain" software.
1
DIFF - File Difference Utility V1.01
2. USAGE
When the DIFF program is started without any arguments, the
following text appears:
DIFF V1.01 #000000701196A - List File Differences
(C) Copyright 1993 C.Sitte Softwaretechnik, All rights reserved.
* UNREGISTERED EVALUATION VERSION *
Enter "diff /r" for registration info
usage is: diff [/options] file1 [file2]
options:
/c case insensitive compare
/b ignore trailing blanks
/x expand tabs before comparing
/s ignore spaces and tabs
/t## tab size (1..19, default=8)
/a display whole file
/w## output width (20..199, default=79)
/r registration information
/? help
file2 can be a drive or directory name
2.1 ARGUMENTS
The DIFF program takes one or two filename arguments. If only the
first argument is given, the second filename is assumed to be the
same filename as the first argument, but with an extension of
".BAK".
The second filename can be a drive or directory name. That means
that the file with the first filename is compared to a file with
the same name in the specified drive/directory.
2.2 COMPARISON OPTIONS
There are the following options available wich must be specified
before the filename(s). Options start with the slash character
("/") as an option identifier and are followed by an option
character which can be written in lower- or uppercase. Two or
more options could be combined in one option argument (e.g.:
DIFF /a /bx file1). Options with numeric arguments must be the
last option in a combined option argument.
The following options are available:
2.2.1 CASE INSENSITIVE COMPARE (/c)
Upper- and lowercase is ignored on comparison.
2
DIFF - File Difference Utility V1.01
2.2.2 IGNORE TRAILING BLANKS (/b)
One or more blanks at the end of a line are ignored during the
comparison.
2.2.3 EXPAND TABS BEFORE COMPARING (/x)
Tab characters (hex 09) in the text are expanded to the number of
spaces specified in the "Tab size" (/t) option (default=8) wich
are neccessary to reach the next tab stop.
This option will be ignored, if the "Ignore spaces and tabs" (/s)
option is selected.
2.2.4 IGNORE SPACES AND TABS (/s)
Tab characters and spaces will be ignored on comparison.
2.2.5 TAB SIZE (/t##)
The tabsize (number of spaces between tab stops) is selectable
between 1 and 19 spaces. The default size is 8 spaces. This
option influences the file comparison, if the "expand tabs" (/x)
options is also set.
Tabs are expanded to the given number of spaces in the difference
display.
2.2.6 DISPLAY WHOLE FILE (/a)
The whole files (not only the different sections) are displayed.
2.2.7 OUTPUT WIDTH (/w##)
The line width of the difference display can be selected between
20 and 199 characters. The default width is 79 characters.
2.3 DIFFERENCE DISPLAY
By default, only the different sections between the two files are
displayed, separated by separator lines. The files are shown side
by side. The first file is shown at the left side, and the second
file at the right side. Each line has a line number. Missing line
numbers means that there is no line in the according file.
3
DIFF - File Difference Utility V1.01
2.3.1 Example
C> diff /t3 /w63 test.cpp
DIFF V1.01 #000000701196A - List File Differences
(C) Copyright 1993 C.Sitte Softwaretechnik, All rights reserved.
* UNREGISTERED EVALUATION VERSION *
Enter "diff /r" for registration info
comparing TEST.CPP with TEST.BAK
---------------------------------------------------------------
1: // diff.cpp -- main progra 1: // diff.cpp - main program
---------------------------------------------------------------
4:
---------------------------------------------------------------
7: extern "C" { 6: extern "C" {
---------------------------------------------------------------
15: //////////////////////////
---------------------------------------------------------------
54: strncpy (LINE1 54: strncpy (line1
---------------------------------------------------------------
64: DIFFSTRING st 64: DIFFSTRING str
---------------------------------------------------------------
72: printf ("-------- 72: printf ("--------
73: "-------------
2.3.2 Redirection
The output of the comparison can be redirected into a file or
piped into another program.
C> diff test.cpp test.old > test.dif
C> diff test.cpp d: | more
4
DIFF - File Difference Utility V1.01
3. WARRANTY
C.SITTE SOFTWARETECHNIK MAKES NO WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF
MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.
C.SITTE SOFTWARETECHNIK SHALL NOT BE LIABLE FOR ANY DAMAGES,
WHETHER DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL ARISING FROM A
FAILURE OF THIS PROGRAM TO OPERATE IN THE MANNER DESIRED BY THE
USER. C.SITTE SOFTWARETECHNIK SHALL NOT BE LIABLE FOR ANY DAMAGE
TO DATA OR PROPERTY WHICH MAY BE CAUSED DIRECTLY OR INDIRECTLY BY
USE OF THE PROGRAM.
IN NO EVENT WILL C.SITTE SOFTWARETECHNIK BE LIABLE TO YOU FOR ANY
DAMAGES, INCLUDING ANY LOST PROFITS, LOST SAVINGS OR OTHER
INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF OR
INABILITY TO USE THESE PROGRAM, EVEN IF C.SITTE SOFTWARETECHNIK
HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR FOR ANY
CLAIM BY ANY OTHER PARTY.
4. ASP OMBUDSMAN STATEMENT
This program is produced by a member of the Association of
Shareware Professionals (ASP) ASP wants to make sure that the
shareware principle works for you. If you are unable to resolve a
shareware-related problem with an ASP member by contacting the
member directly, ASP may be able to help. The ASP Ombudsman can
help you resolve a dispute or problem with an ASP member, but
does not provide technical support for members' products. Please
write to the ASP Ombudsman at 545 Grover Road, Muskegon, MI
49442-9427, USA or send a CompuServe message via CompuServe Mail
to ASP Ombudsman 70007,3536.
The Ombudsman may be contacted by FAX by sending to the ASP FAX
number: (616) 788-2765. In communication with the Ombudsman
please include a telephone number and/or FAX if available.
┌───────┐
┌────┴──┐ │ (R)
──│ │ │───────────────────
│ ┌────┴──┐ │ Association of
│ │ │─┘ Shareware
└──│ o │ Professionals
─────│ │ │─────────────────────
└───┴───┘ MEMBER
5
DIFF - File Difference Utility V1.01
5. ORDER INFORMATION
The registration fee for a single copy of DIFF is US$ 15.-.
Payment of this fee entitles you to:
* Disk with the latest version of DIFF which does not display
the shareware notices and registration reminders.
* Free support by electronic mail or by mail for the
first six month after payment.
* Additional disk labels for the number of ordered copy
licences.
* Notification of the next major upgrade.
* Shareware versions of other products of
C.Sitte Softwaretechnik
The following per-unit prices apply for registration of one or
more copies of DIFF on the same order form:
1 US$ 15.-
2 - 9 US$ 10.- (-35%)
10+ (negotiable)
It is also possible to obtain an additional site licence (copy
license). A minimum of one disk must be ordered. The licensee is
responsible for duplicating the diskette as needed, and for
ensuring that the number of installed copies is not exceeded.
Additional disk labels for the number of ordered copy licences
will be delivered.
25 User US$ 120.-
50 User US$ 200.-
100 User US$ 320.-
100+ (negotiable)
An additional shipping & handling charge of US$ 5.- must be added
to the total amount.
Payments can be made by credit card (MC/Visa/AmEx/JCB), cash,
international postal money order or eurocheque. If you use an US
check, please add another US$ 5.- for bank charges.
The accompanying file ORDER.FRM includes a detailed order form.
6
DIFF - File Difference Utility V1.01
6. To help you - help us!
If you have questions about the DIFF File Difference Utility,
please describe your problem as detailed as possible, so that we
are able to simulate it according to your information.
Send this information to us via mail or electronic mail:
Mail: C.SITTE SOFTWARETECHNIK
Postfach 42
A-5025 Salzburg, AUSTRIA
Electronic Mail:
CompuServe: 73030,1070
Internet : 73030.1070@compuserve.com
X400 : Country=us
ADMD=CompuServe
PRMD=csmail
DDA Type=id
DDA Value=73030.1070
MCI users should enter these values
at the following prompts:
To : Chris Sitte (ems)
EMS: CompuServe
MBX: p=csmail
MBX: d=id=73030.1070
REVISION HISTORY
v1.01 May/93 Initial shareware release of DIFF
7